bitkeeper revision 1.1159.1.375 (418a92c65GAOZnDDyo9gXyKiJkLKxQ)

Avoid error message when trying to copy config file from install dir.

diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index c83291324ee2392828b8165886613669c6ea0b9c..aded0d43b2d058433b46d44c63747f0154f19301 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -33,8 +33,11 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_VER) patches/ebtables.diff
          rm -f Makefile ; mv Mk.tmp Makefile )
        # add ebtables patch
        ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/ebtables.diff )
-       # Re-use config from install dir if one exits else use make defconfig
-       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config
+       # Re-use config from install dir if one exits else use default config
+       [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
+         cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+         || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
+               $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
 

diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index c1afc937082c988fdc411db0fe2e59979faee99e..946964453169c46fcdfc5781e3ac116afc732eba 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -31,8 +31,11 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_VER) patches/ebtables.diff
        ( cd $(LINUX_DIR) ; \
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
-       # Re-use config from install dir if one exits else use make defconfig
-       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) $(LINUX_DIR)/.config
+       # Re-use config from install dir if one exits else use default config
+       [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
+         cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+         || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
+               $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig
        make -C $(LINUX_DIR) ARCH=xen dep
 

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 67a5c7b3a8c36f1894f040381a8e164c4d0f07b5..a2a8551ad75ea7f06247b04026b04e22a0e9c654 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -27,8 +27,11 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_VER)
        ( cd $(LINUX_DIR) ; \
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
-       # Re-use config from install dir if one exits else use make defconfig
-       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
+       # Re-use config from install dir if one exits else use default config
+       [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
+         cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+               $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig
 
 clean:

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 6782cf07b72eede22482fd1ec33a6220fc96173a..70841551b514b5e1cd611fce99175e27f72fdc59 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -28,8 +28,11 @@ $(LINUX_DIR):  pristine-linux-$(LINUX_VER)
        ( cd $(LINUX_DIR) ; \
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
-       # Re-use config from install dir if one exits else use make defconfig
-       cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig $(LINUX_DIR)/.config
+       # Re-use config from install dir if one exits else use default config
+       [ -r $(INSTALL_DIR)/boot/config-$(FULLVERSION) ] && \
+         cp $(INSTALL_DIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+               $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig
 
 clean: